projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3b4a1f6
)
(main): Fix last change.
author
Eli Zaretskii
<eliz@gnu.org>
Mon, 20 Mar 2006 20:34:16 +0000
(20:34 +0000)
committer
Eli Zaretskii
<eliz@gnu.org>
Mon, 20 Mar 2006 20:34:16 +0000
(20:34 +0000)
src/ChangeLog
patch
|
blob
|
history
src/emacs.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 901ca108b1ec60ddc08e9974bfea337088999639..695d72d10a3c107a3c3eac139e765b4c2a0090fb 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,7
@@
+2006-03-20 Eli Zaretskii <eliz@gnu.org>
+
+ * emacs.c (main): Fix last change.
+
2006-03-20 Kenichi Handa <handa@m17n.org>
* fileio.c (Fwrite_region): Set visit_file to Qnil before GCPRO
diff --git
a/src/emacs.c
b/src/emacs.c
index 259c8c3381e163fac4e50fd59c05943ab561a525..62a23f70859b60fe7436b333b4c935bd013bbd1b 100644
(file)
--- a/
src/emacs.c
+++ b/
src/emacs.c
@@
-1488,7
+1488,7
@@
main (argc, argv
skip_args = count_before;
/* Do not be lenient if the user explicitly asked for a named display. */
- if (display_arg
!
= 1 && !x_display_ok (displayname))
+ if (display_arg
=
= 1 && !x_display_ok (displayname))
{
fprintf (stderr, "Display %s unavailable, simulating -nw\n",
displayname);